Merge "Put the HTML attribute whitelist closer to HTML5"

diff --combined tests/phpunit/includes/SanitizerTest.php
index 81246d3,c8c624e..97abf80
--- 1/tests/phpunit/includes/SanitizerTest.php
--- 2/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@@ -1,9 -1,5 +1,9 @@@
  <?php
  
 +/**
 + * @todo Tests covering decodeCharReferences can be refactored into a single
 + * method and dataprovider.
 + */
  class SanitizerTest extends MediaWikiTestCase {
  
        protected function setUp() {
@@@ -12,10 -8,7 +12,10 @@@
                AutoLoader::loadClass( 'Sanitizer' );
        }
  
 -      function testDecodeNamedEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testDecodeNamedEntities() {
                $this->assertEquals(
                        "\xc3\xa9cole",
                        Sanitizer::decodeCharReferences( '&eacute;cole' ),
@@@ -23,10 -16,7 +23,10 @@@
                );
        }
  
 -      function testDecodeNumericEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testDecodeNumericEntities() {
                $this->assertEquals(
                        "\xc4\x88io bonas dans l'\xc3\xa9cole!",
                        Sanitizer::decodeCharReferences( "&#x108;io bonas dans l'&#233;cole!" ),
@@@ -34,10 -24,7 +34,10 @@@
                );
        }
  
 -      function testDecodeMixedEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testDecodeMixedEntities() {
                $this->assertEquals(
                        "\xc4\x88io bonas dans l'\xc3\xa9cole!",
                        Sanitizer::decodeCharReferences( "&#x108;io bonas dans l'&eacute;cole!" ),
@@@ -45,10 -32,7 +45,10 @@@
                );
        }
  
 -      function testDecodeMixedComplexEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testDecodeMixedComplexEntities() {
                $this->assertEquals(
                        "\xc4\x88io bonas dans l'\xc3\xa9cole! (mais pas &#x108;io dans l'&eacute;cole)",
                        Sanitizer::decodeCharReferences(
@@@ -58,10 -42,7 +58,10 @@@
                );
        }
  
 -      function testInvalidAmpersand() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testInvalidAmpersand() {
                $this->assertEquals(
                        'a & b',
                        Sanitizer::decodeCharReferences( 'a & b' ),
@@@ -69,10 -50,7 +69,10 @@@
                );
        }
  
 -      function testInvalidEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testInvalidEntities() {
                $this->assertEquals(
                        '&foo;',
                        Sanitizer::decodeCharReferences( '&foo;' ),
@@@ -80,10 -58,7 +80,10 @@@
                );
        }
  
 -      function testInvalidNumberedEntities() {
 +      /**
 +       * @covers Sanitizer::decodeCharReferences
 +       */
 +      public function testInvalidNumberedEntities() {
                $this->assertEquals( UTF8_REPLACEMENT, Sanitizer::decodeCharReferences( "&#88888888888888;" ), 'Invalid numbered entity' );
        }
  
@@@ -94,7 -69,7 +94,7 @@@
         * @param String $tag Name of an HTML5 element (ie: 'video')
         * @param Boolean $escaped Wheter sanitizer let the tag in or escape it (ie: '&lt;video&gt;')
         */
 -      function testRemovehtmltagsOnHtml5Tags( $tag, $escaped ) {
 +      public function testRemovehtmltagsOnHtml5Tags( $tag, $escaped ) {
                $this->setMwGlobals( array(
                        'wgUseTidy' => false
                ) );
@@@ -156,9 -131,8 +156,9 @@@
  
        /**
         * @dataProvider dataRemoveHTMLtags
 +       * @covers Sanitizer::removeHTMLtags
         */
 -      function testRemoveHTMLtags( $input, $output, $msg = null ) {
 +      public function testRemoveHTMLtags( $input, $output, $msg = null ) {
                $GLOBALS['wgUseTidy'] = false;
                $this->assertEquals( $output, Sanitizer::removeHTMLtags( $input ), $msg );
        }
@@@ -167,7 -141,7 +167,7 @@@
         * @dataProvider provideTagAttributesToDecode
         * @covers Sanitizer::decodeTagAttributes
         */
 -      function testDecodeTagAttributes( $expected, $attributes, $message = '' ) {
 +      public function testDecodeTagAttributes( $expected, $attributes, $message = '' ) {
                $this->assertEquals( $expected,
                        Sanitizer::decodeTagAttributes( $attributes ),
                        $message
@@@ -215,7 -189,7 +215,7 @@@
         * @dataProvider provideDeprecatedAttributes
         * @covers Sanitizer::fixTagAttributes
         */
 -      function testDeprecatedAttributesUnaltered( $inputAttr, $inputEl, $message = '' ) {
 +      public function testDeprecatedAttributesUnaltered( $inputAttr, $inputEl, $message = '' ) {
                $this->assertEquals( " $inputAttr",
                        Sanitizer::fixTagAttributes( $inputAttr, $inputEl ),
                        $message
@@@ -235,7 -209,7 +235,7 @@@
                        array( 'align="left"', 'tr' ),
                        array( 'align="center"', 'div' ),
                        array( 'align="left"', 'h1' ),
-                       array( 'align="left"', 'span' ),
+                       array( 'align="left"', 'p' ),
                );
        }
  
@@@ -243,7 -217,7 +243,7 @@@
         * @dataProvider provideCssCommentsFixtures
         * @covers Sanitizer::checkCss
         */
 -      function testCssCommentsChecking( $expected, $css, $message = '' ) {
 +      public function testCssCommentsChecking( $expected, $css, $message = '' ) {
                $this->assertEquals( $expected,
                        Sanitizer::checkCss( $css ),
                        $message
@@@ -291,9 -265,8 +291,9 @@@
  
        /**
         * @dataProvider provideAttributeSupport
 +       * @covers Sanitizer::fixTagAttributes
         */
 -      function testAttributeSupport( $tag, $attributes, $expected, $message ) {
 +      public function testAttributeSupport( $tag, $attributes, $expected, $message ) {
                $this->assertEquals( $expected,
                        Sanitizer::fixTagAttributes( $attributes, $tag ),
                        $message